bitkeeper revision 1.1389.5.6 (427898d4o1E6hrH0W0u6j1RHmjFkVw)

Revert gratuitous Linux changes and fix maxcpus mess properly.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c
index 36f313364f08ae761ac47336fefc704a2f5363a1..94ab4fd89f4d1a996988ec276ce2181d27b8907c 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c
@@ -37,7 +37,7 @@
 
 /* Have we found an MP table */
 int smp_found_config;
-extern unsigned int maxcpus;
+unsigned int __initdata maxcpus = NR_CPUS;
 
 /*
  * Various Linux-internal data structures created from the

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
index 772815d4b24a556ee919f71035e6e6fe52873637..68950efa56fb5c1a7fca2573bd979573eebcd4d7 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
@@ -67,8 +67,6 @@ static struct notifier_block xen_panic_block = {
 
 int disable_pse __initdata = 0;
 
-unsigned int __initdata maxcpus = NR_CPUS;
-
 /*
  * Machine setup..
  */
@@ -781,12 +779,14 @@ static void __init parse_cmdline_early (char ** cmdline_p)
                        noexec_setup(from + 7);
 
 
-#ifdef  CONFIG_X86_SMP
+#ifdef  CONFIG_X86_MPPARSE
                /*
                 * If the BIOS enumerates physical processors before logical,
                 * maxcpus=N at enumeration-time can be used to disable HT.
                 */
                else if (!memcmp(from, "maxcpus=", 8)) {
+                       extern unsigned int maxcpus;
+
                        maxcpus = simple_strtoul(from + 8, NULL, 0);
                }
 #endif